From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Wed, 2 Oct 2019 19:08:44 +0000 (+0200)
Subject: kamailio-5.x: update to 5.2.4
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22http:/www.crowdsec.net/%22/%22https:/collectd.org/%22http:/www.crowdsec.net/%22?a=commitdiff_plain;h=refs%2Fpull%2F461%2Fhead;p=feed%2Ftelephony.git

kamailio-5.x: update to 5.2.4

Minor version bump.

Also renamed ./files/kamailio.config to ./files/kamailio.conf as per
OpenWrt package policies [1].

One patch refreshed.

[1] https://openwrt.org/docs/guide-developer/package-policies

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
---

diff --git a/net/kamailio-5.x/Makefile b/net/kamailio-5.x/Makefile
index c56b6eb..b7b824d 100644
--- a/net/kamailio-5.x/Makefile
+++ b/net/kamailio-5.x/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kamailio5
-PKG_VERSION:=5.2.1
-PKG_RELEASE:=2
+PKG_VERSION:=5.2.4
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=https://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src
 PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz
-PKG_HASH:=95d2158f97c76124a381364d99de1420f193275c5a1c9f88489c6409702f2c8f
+PKG_HASH:=484488879fa3c790bbd940bb81bac90639f4dccfc1c2b4e75db38f65d4020393
 PKG_USE_MIPS16:=0
 
 PKG_LICENSE:=GPL-2.0+
@@ -271,7 +271,7 @@ $(foreach c,kamailio.cfg kamctlrc,$(call Package/kamailio5/install/conffile,$(1)
 		$(1)/usr/lib/kamailio/
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) \
-		./files/kamailio.config \
+		./files/kamailio.conf \
 		$(1)/etc/config/kamailio
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) \
diff --git a/net/kamailio-5.x/files/kamailio.conf b/net/kamailio-5.x/files/kamailio.conf
new file mode 100644
index 0000000..f1a9c36
--- /dev/null
+++ b/net/kamailio-5.x/files/kamailio.conf
@@ -0,0 +1,25 @@
+
+config kamailio 'general'
+	option enabled 0
+	option user kamailio
+	option group kamailio
+	# Amount of shared and private memory to allocate in MByte:
+	option shm_memory 8
+	option pkg_memory 2
+	option cfg_file /etc/kamailio/kamailio.cfg
+	# The lists "listen" and "listen6" basically have the same
+	# effect - each list entry will be added to the Kamailio command
+	# line ("-l address"). However, the init script will try to
+	# resolve any interface specifier into an IPv4 ("listen") or
+	# IPv6 ("listen6") address before starting Kamailio. These lists
+	# may be helpful when using dynamic IPs.
+	#list listen udp:wan:5060
+	#list listen udp:192.168.1.1:5060
+	#list listen6 udp:wan:5060
+	# Any other option can be put between the quotes below:
+	#option options ""
+
+config kamailio 'hotplug'
+	# Uncomment to enable hotplug:
+	#option interface 'wan'
+
diff --git a/net/kamailio-5.x/files/kamailio.config b/net/kamailio-5.x/files/kamailio.config
deleted file mode 100644
index f1a9c36..0000000
--- a/net/kamailio-5.x/files/kamailio.config
+++ /dev/null
@@ -1,25 +0,0 @@
-
-config kamailio 'general'
-	option enabled 0
-	option user kamailio
-	option group kamailio
-	# Amount of shared and private memory to allocate in MByte:
-	option shm_memory 8
-	option pkg_memory 2
-	option cfg_file /etc/kamailio/kamailio.cfg
-	# The lists "listen" and "listen6" basically have the same
-	# effect - each list entry will be added to the Kamailio command
-	# line ("-l address"). However, the init script will try to
-	# resolve any interface specifier into an IPv4 ("listen") or
-	# IPv6 ("listen6") address before starting Kamailio. These lists
-	# may be helpful when using dynamic IPs.
-	#list listen udp:wan:5060
-	#list listen udp:192.168.1.1:5060
-	#list listen6 udp:wan:5060
-	# Any other option can be put between the quotes below:
-	#option options ""
-
-config kamailio 'hotplug'
-	# Uncomment to enable hotplug:
-	#option interface 'wan'
-
diff --git a/net/kamailio-5.x/patches/050-fix-kamailio-utils.patch b/net/kamailio-5.x/patches/050-fix-kamailio-utils.patch
index e52da41..780c181 100644
--- a/net/kamailio-5.x/patches/050-fix-kamailio-utils.patch
+++ b/net/kamailio-5.x/patches/050-fix-kamailio-utils.patch
@@ -27,7 +27,7 @@
 +++ b/utils/kamctl/kamctl.base
 @@ -651,7 +651,7 @@ in SIP_DOMAIN"
  check_aor() {
- 	echo "$1" | $EGREP "^$USERNAME_RE@.*\..*" >/dev/null
+ 	echo "$1" | $EGREP "^$USERNAME_RE@.+" >/dev/null
  	if [ $? -ne 0 ] ; then
 -		echo "error: invalid AoR: $1" > /dev/stderr
 +		echo "error: invalid AoR: $1" >&2
@@ -36,7 +36,7 @@
  }
 @@ -670,7 +670,7 @@ is_aor() {
  check_sipaor() {
- 	echo "$1" | $EGREP "^sip(s)?:$USERNAME_RE@.*\..*" >/dev/null
+ 	echo "$1" | $EGREP "^sip(s)?:$USERNAME_RE@.+" >/dev/null
  	if [ $? -ne 0 ] ; then
 -		echo "error: invalid SIP AoR: $1" > /dev/stderr
 +		echo "error: invalid SIP AoR: $1" >&2
@@ -45,7 +45,7 @@
  }
 @@ -681,7 +681,7 @@ check_sipaor() {
  check_uri() {
- 	echo "$1" | $EGREP "^sip(s)?:($USERNAME_RE@)?.*\..*"  > /dev/null
+ 	echo "$1" | $EGREP "^sip(s)?:($USERNAME_RE@)?.+"  > /dev/null
  	if [ $? -ne 0 ] ; then
 -		echo "error: invalid SIP URI: $1" > /dev/stderr
 +		echo "error: invalid SIP URI: $1" >&2